From 384a795275fa59169da01dbf7807ef84303f1e55 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 20 Apr 2015 14:54:28 +0100 Subject: [PATCH] Makefile-newvs: some .vcxproj.filters files are in builddir, some in srcdir Without this change, out-of-tree distcheck doesn't get very far. Similarly, allow *.vcxproj, *.props to be in either the builddir or the srcdir. Finally, since I'm touching these lines anyway, eliminate some useless uses of cat: "cat x | sed 's/foo/bar/' > y" is equivalent to "sed 's/foo/bar/' < x > y". Bug: https://bugzilla.gnome.org/show_bug.cgi?id=748176 Reviewed-by: Chun-wei Fan --- build/Makefile-newvs.am | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am index 9239b96d18..e3acd9197f 100644 --- a/build/Makefile-newvs.am +++ b/build/Makefile-newvs.am @@ -16,12 +16,22 @@ README.txt: $(top_srcdir)/build/win32/vs10/README.txt cat $< | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ %.vcxproj: - cat $(top_builddir)/build/win32/vs10/$@ | sed 's/v100/v$(MSVC_VER)0/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi %.props: - cat $(top_builddir)/build/win32/vs10/$@ | sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi %.vcxproj.filters: - cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ - - + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi -- 2.30.2